Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker #17580

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Update docker #17580

merged 1 commit into from
Sep 18, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 18, 2024

Changes:

Changes:

- docker-library/docker@bd530b1: Update 27-rc to 27.3.0-rc.2
@tianon tianon requested a review from a team as a code owner September 18, 2024 16:08
Copy link

Diff for f4aa9e9:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7a2ae21..15e1532 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -33,33 +33,33 @@ Directory: 27/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 27.3.0-rc.1-cli, 27-rc-cli, rc-cli, 27.3.0-rc.1-cli-alpine3.20
+Tags: 27.3.0-rc.2-cli, 27-rc-cli, rc-cli, 27.3.0-rc.2-cli-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 99372b0dca1bacabe5af124932b9017526068dad
+GitCommit: bd530b134ed9c16199a1c7a9d417676c91adc7ee
 Directory: 27-rc/cli
 
-Tags: 27.3.0-rc.1-dind, 27-rc-dind, rc-dind, 27.3.0-rc.1-dind-alpine3.20, 27.3.0-rc.1, 27-rc, rc, 27.3.0-rc.1-alpine3.20
+Tags: 27.3.0-rc.2-dind, 27-rc-dind, rc-dind, 27.3.0-rc.2-dind-alpine3.20, 27.3.0-rc.2, 27-rc, rc, 27.3.0-rc.2-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 8debc3edb949c6d48307282188d534d95f9ad305
+GitCommit: bd530b134ed9c16199a1c7a9d417676c91adc7ee
 Directory: 27-rc/dind
 
-Tags: 27.3.0-rc.1-dind-rootless, 27-rc-dind-rootless, rc-dind-rootless
+Tags: 27.3.0-rc.2-dind-rootless, 27-rc-dind-rootless, rc-dind-rootless
 Architectures: amd64, arm64v8
-GitCommit: 8debc3edb949c6d48307282188d534d95f9ad305
+GitCommit: bd530b134ed9c16199a1c7a9d417676c91adc7ee
 Directory: 27-rc/dind-rootless
 
-Tags: 27.3.0-rc.1-windowsservercore-1809, 27-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 27.3.0-rc.1-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
+Tags: 27.3.0-rc.2-windowsservercore-1809, 27-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 27.3.0-rc.2-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
 Architectures: windows-amd64
-GitCommit: 99372b0dca1bacabe5af124932b9017526068dad
+GitCommit: bd530b134ed9c16199a1c7a9d417676c91adc7ee
 Directory: 27-rc/windows/windowsservercore-1809
 Builder: classic
 Constraints: windowsservercore-1809
 
-Tags: 27.3.0-rc.1-windowsservercore-ltsc2022, 27-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
-SharedTags: 27.3.0-rc.1-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
+Tags: 27.3.0-rc.2-windowsservercore-ltsc2022, 27-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 27.3.0-rc.2-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
 Architectures: windows-amd64
-GitCommit: 99372b0dca1bacabe5af124932b9017526068dad
+GitCommit: bd530b134ed9c16199a1c7a9d417676c91adc7ee
 Directory: 27-rc/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 112652e..9347e4d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -29,16 +29,16 @@ docker:27.2.1-dind-rootless
 docker:27.2.1-windowsservercore
 docker:27.2.1-windowsservercore-1809
 docker:27.2.1-windowsservercore-ltsc2022
-docker:27.3.0-rc.1
-docker:27.3.0-rc.1-alpine3.20
-docker:27.3.0-rc.1-cli
-docker:27.3.0-rc.1-cli-alpine3.20
-docker:27.3.0-rc.1-dind
-docker:27.3.0-rc.1-dind-alpine3.20
-docker:27.3.0-rc.1-dind-rootless
-docker:27.3.0-rc.1-windowsservercore
-docker:27.3.0-rc.1-windowsservercore-1809
-docker:27.3.0-rc.1-windowsservercore-ltsc2022
+docker:27.3.0-rc.2
+docker:27.3.0-rc.2-alpine3.20
+docker:27.3.0-rc.2-cli
+docker:27.3.0-rc.2-cli-alpine3.20
+docker:27.3.0-rc.2-dind
+docker:27.3.0-rc.2-dind-alpine3.20
+docker:27.3.0-rc.2-dind-rootless
+docker:27.3.0-rc.2-windowsservercore
+docker:27.3.0-rc.2-windowsservercore-1809
+docker:27.3.0-rc.2-windowsservercore-ltsc2022
 docker:cli
 docker:dind
 docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 844d428..519e61c 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,10 +1,10 @@
 docker:27.2.1-cli-alpine3.20
-docker:27.3.0-rc.1-cli-alpine3.20
+docker:27.3.0-rc.2-cli-alpine3.20
 docker:rc-windowsservercore-1809
 docker:rc-windowsservercore-ltsc2022
 docker:windowsservercore-1809
 docker:windowsservercore-ltsc2022
 docker:27.2.1-alpine3.20
-docker:27.3.0-rc.1-alpine3.20
+docker:27.3.0-rc.2-alpine3.20
 docker:dind-rootless
 docker:rc-dind-rootless
diff --git a/docker_27.3.0-rc.1-alpine3.20/Dockerfile b/docker_27.3.0-rc.2-alpine3.20/Dockerfile
similarity index 97%
rename from docker_27.3.0-rc.1-alpine3.20/Dockerfile
rename to docker_27.3.0-rc.2-alpine3.20/Dockerfile
index 064571f..6b90e61 100644
--- a/docker_27.3.0-rc.1-alpine3.20/Dockerfile
+++ b/docker_27.3.0-rc.2-alpine3.20/Dockerfile
@@ -61,16 +61,16 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.2.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.2.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.2.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.2.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_27.3.0-rc.1-alpine3.20/dockerd-entrypoint.sh b/docker_27.3.0-rc.2-alpine3.20/dockerd-entrypoint.sh
similarity index 100%
rename from docker_27.3.0-rc.1-alpine3.20/dockerd-entrypoint.sh
rename to docker_27.3.0-rc.2-alpine3.20/dockerd-entrypoint.sh
diff --git a/docker_27.3.0-rc.1-cli-alpine3.20/Dockerfile b/docker_27.3.0-rc.2-cli-alpine3.20/Dockerfile
similarity index 98%
rename from docker_27.3.0-rc.1-cli-alpine3.20/Dockerfile
rename to docker_27.3.0-rc.2-cli-alpine3.20/Dockerfile
index 4d48abb..d028099 100644
--- a/docker_27.3.0-rc.1-cli-alpine3.20/Dockerfile
+++ b/docker_27.3.0-rc.2-cli-alpine3.20/Dockerfile
@@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf
 RUN set -eux; \
 	addgroup -g 2375 -S docker
 
-ENV DOCKER_VERSION 27.3.0-rc.1
+ENV DOCKER_VERSION 27.3.0-rc.2
 
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.2.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.2.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.2.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.2.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_27.3.0-rc.1-cli-alpine3.20/docker-entrypoint.sh b/docker_27.3.0-rc.2-cli-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from docker_27.3.0-rc.1-cli-alpine3.20/docker-entrypoint.sh
rename to docker_27.3.0-rc.2-cli-alpine3.20/docker-entrypoint.sh
diff --git a/docker_27.3.0-rc.1-cli-alpine3.20/modprobe.sh b/docker_27.3.0-rc.2-cli-alpine3.20/modprobe.sh
similarity index 100%
rename from docker_27.3.0-rc.1-cli-alpine3.20/modprobe.sh
rename to docker_27.3.0-rc.2-cli-alpine3.20/modprobe.sh
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
index 818a005..9fd9f14 100644
--- a/docker_rc-dind-rootless/Dockerfile
+++ b/docker_rc-dind-rootless/Dockerfile
@@ -24,10 +24,10 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.2.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.2.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_rc-windowsservercore-1809/Dockerfile b/docker_rc-windowsservercore-1809/Dockerfile
index 4f638d6..35fceeb 100644
--- a/docker_rc-windowsservercore-1809/Dockerfile
+++ b/docker_rc-windowsservercore-1809/Dockerfile
@@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV DOCKER_VERSION 27.3.0-rc.1
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.1.zip
+ENV DOCKER_VERSION 27.3.0-rc.2
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.2.zip
 # TODO ENV DOCKER_SHA256
 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
 # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)
diff --git a/docker_rc-windowsservercore-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
index ab04ef9..aa0c3e4 100644
--- a/docker_rc-windowsservercore-ltsc2022/Dockerfile
+++ b/docker_rc-windowsservercore-ltsc2022/Dockerfile
@@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV DOCKER_VERSION 27.3.0-rc.1
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.1.zip
+ENV DOCKER_VERSION 27.3.0-rc.2
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.2.zip
 # TODO ENV DOCKER_SHA256
 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
 # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)

Relevant Maintainers:

@yosifkit yosifkit merged commit a70b9a9 into docker-library:master Sep 18, 2024
11 checks passed
@yosifkit yosifkit deleted the docker branch September 18, 2024 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants